Clean up user data. (#344624, Christian Weiske)

2006-06-12  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_finalize):
	Clean up user data.  (#344624, Christian Weiske)

diff --git a/ChangeLog b/ChangeLog
index ddad3ee85b6bf3aa7063f3d3830f4ce555dd74ad..37e319ec4ab0e6518486360822d3d76099682e67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_finalize): 
+       Clean up user data.  (#344624, Christian Weiske)
+
        * NEWS: Updates
 
        * gtk/gtkprintjob.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ddad3ee85b6bf3aa7063f3d3830f4ce555dd74ad..37e319ec4ab0e6518486360822d3d76099682e67 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-06-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_finalize): 
+       Clean up user data.  (#344624, Christian Weiske)
+
        * NEWS: Updates
 
        * gtk/gtkprintjob.c:

diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index e194035b160a725411512161a07d369cd938f526..7d16935aedf1c20b114bb326b07d88e581aa18f4 100644 (file)
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -97,7 +97,7 @@ struct _GtkTreeModelFilterPrivate
   GType *modify_types;
   GtkTreeModelFilterModifyFunc modify_func;
   gpointer modify_data;
-  gpointer modify_destroy;
+  GtkDestroyNotify modify_destroy;
 
   gint visible_column;
 
@@ -372,6 +372,12 @@ gtk_tree_model_filter_finalize (GObject *object)
 
   if (filter->priv->modify_types)
     g_free (filter->priv->modify_types);
+  
+  if (filter->priv->modify_destroy)
+    filter->priv->modify_destroy (filter->priv->modify_data);
+
+  if (filter->priv->visible_destroy)
+    filter->priv->visible_destroy (filter->priv->visible_data);
 
   /* must chain up */
   G_OBJECT_CLASS (gtk_tree_model_filter_parent_class)->finalize (object);